xend: Fix shutdown method after PV-on-HVM save/restore patch.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 3fdba4d8f2fb4ec8693da4342aa041ebb801ca84..7ba20fb5660e5daaa6879db870797fe96fce52cb 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -448,14 +448,13 @@ class XendDomainInfo:
         self._removeVm('xend/previous_restart_time')
         self.storeDom("control/shutdown", reason)
 
-        ## HVM domain shutdown itself if has PV driver,
-        ## otherwise remote shutdown it
-        hvm_pvdrv = xc.hvm_get_param(self.domid, HVM_PARAM_CALLBACK_IRQ)
-        if self.info.is_hvm() and not hvm_pvdrv:
-            code = REVERSE_DOMAIN_SHUTDOWN_REASONS[reason]
-            log.info("HVM save:remote shutdown dom %d!", self.domid)
-            xc.domain_shutdown(self.domid, code)
-
+        # HVM domain shuts itself down only if it has PV drivers
+        if self.info.is_hvm():
+            hvm_pvdrv = xc.hvm_get_param(self.domid, HVM_PARAM_CALLBACK_IRQ)
+            if not hvm_pvdrv:
+                code = REVERSE_DOMAIN_SHUTDOWN_REASONS[reason]
+                log.info("HVM save:remote shutdown dom %d!", self.domid)
+                xc.domain_shutdown(self.domid, code)
 
     def pause(self):
         """Pause domain